Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 23:34:54 +0000 (23:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 23:34:54 +0000 (23:34 +0000)
commit94e24730ee96d2e329946572c15061f8a0e79cbb
tree34e5bfe65e62780a7fd11f038fd7c8e8a367d434
parent448a6259a83f8465d998f13bbaf79d9f71e4945e
parent42e1d83d3d9def1dcf7cc42e0b562d144899d373
Merge from mainline.